Checked picture-xtra.texi

* doc/emacs/picture-xtra.texi (Basic Picture): C-a does get remapped.

* lisp/textmodes/picture.el (picture-motion, picture-motion-reverse)
(picture-self-insert, picture-tab-chars): Doc fix.
(picture-mode-map): Fix C-a, C-e.

* admin/FOR-RELEASE: Related markup.

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 6db804b6a1f59f16b92fe0af0ab87a902794d0df..d1150b6d60b67c24c8c6decf6e4d52cb51360dee 100644 (file)
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -161,7 +161,7 @@ msdog-xtra.texi
 mule.texi         
 m-x.texi          cyd
 package.texi      cyd
-picture-xtra.texi
+picture-xtra.texi rgm  (see bug#10860)
 programs.texi     cyd
 regs.texi         cyd
 rmail.texi        rgm

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f01dfbc8f1bfb9e5d8b21c0e0d7993eb3acece14..160d819c2a6c29b3b83fd20b20eda8cb2501106e 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,7 @@
 2012-02-21  Glenn Morris  <rgm@gnu.org>
 
+       * picture-xtra.texi (Basic Picture): C-a does get remapped.
+
        * ack.texi (Acknowledgments): Small changes, including resorting,
        and removal of things no longer distributed.
 

diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi
index 629baaf9c52a57aaceea695ed4616bcd47c5fc09..5a10bf2c31c5e022e08addb0725b2ac878959de4 100644 (file)
--- a/doc/emacs/picture-xtra.texi
+++ b/doc/emacs/picture-xtra.texi
@@ -78,9 +78,10 @@ column, converting a tab to multiple spaces if necessary.  @kbd{C-n} and
 @code{picture-move-up}, which can either insert spaces or convert tabs
 as necessary to make sure that point stays in exactly the same column.
 @kbd{C-e} runs @code{picture-end-of-line}, which moves to after the last
-nonblank character on the line.  There is no need to change @kbd{C-a},
-as the choice of screen model does not affect beginnings of
-lines.
+nonblank character on the line.  @kbd{C-a} runs
+@code{picture-beginning-of-line}.  (The choice of screen model does not
+affect beginnings of lines; the only extra thing this command does is
+update the current picture column to 0.)
 
 @findex picture-newline
   Insertion of text is adapted to the quarter-plane screen model

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56e66de315d4a3c4e274bea0b5cb24e7dad2475a..d8b232ba9fec1fe8b151b7e4d9e5bb95e88d9abf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-21  Glenn Morris  <rgm@gnu.org>
+
+       * textmodes/picture.el (picture-motion, picture-motion-reverse)
+       (picture-self-insert, picture-tab-chars): Doc fix.
+       (picture-mode-map): Fix C-a, C-e.
+
 2012-02-20  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp/authors.el (authors-aliases): Add another entry.

diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 577e12b9b40aac64d5deeeeea10823fd921904e4..911defd8dba185b7c8e973aa910e873b9d73c34e 100644 (file)
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -1,6 +1,6 @@
 ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model
 
-;; Copyright (C) 1985, 1994, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1994, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
@@ -211,7 +211,7 @@ The mode line is updated to reflect the current direction."
   "Move point in direction of current picture motion in Picture mode.
 With ARG do it that many times.  Useful for delineating rectangles in
 conjunction with diagonal picture motion.
-Do \\[command-apropos]  picture-movement  to see commands which control motion."
+Use \"\\[command-apropos] picture-movement\" to see commands which control motion."
   (interactive "^p")
   (picture-move-down (* arg picture-vertical-step))
   (picture-forward-column (* arg picture-horizontal-step)))
@@ -220,7 +220,7 @@ Do \\[command-apropos]  picture-movement  to see commands which control motion."
   "Move point in direction opposite of current picture motion in Picture mode.
 With ARG do it that many times.  Useful for delineating rectangles in
 conjunction with diagonal picture motion.
-Do \\[command-apropos]  picture-movement  to see commands which control motion."
+Use \"\\[command-apropos] picture-movement\" to see commands which control motion."
   (interactive "^p")
   (picture-motion (- arg)))
 
@@ -280,7 +280,7 @@ Do \\[command-apropos]  picture-movement  to see commands which control motion."
   "Insert this character in place of character previously at the cursor.
 The cursor then moves in the direction you previously specified
 with the commands `picture-movement-right', `picture-movement-up', etc.
-Do \\[command-apropos] `picture-movement' to see those commands."
+Use \"\\[command-apropos] picture-movement\" to see those commands."
   (interactive "p")
   (picture-update-desired-column (not (eq this-command last-command)))
   (picture-insert last-command-event arg)) ; Always a character in this case.
@@ -378,8 +378,10 @@ With positive argument insert that many lines."
 
 (defcustom picture-tab-chars "!-~"
   "A character set which controls behavior of commands.
-\\[picture-set-tab-stops] and \\[picture-tab-search].  It is NOT a
-regular expression, any regexp special characters will be quoted.
+\\[picture-set-tab-stops] and \\[picture-tab-search].
+The syntax for this variable is like the syntax used inside of `[...]'
+in a regular expression--but without the `[' and the `]'.
+It is NOT a regular expression, any regexp special characters will be quoted.
 It defines a set of \"interesting characters\" to look for when setting
 \(or searching for) tab stops, initially \"!-~\" (all printing characters).
 For example, suppose that you are editing a table which is formatted thus:
@@ -627,8 +629,8 @@ Leaves the region surrounding the rectangle."
       (picture-substitute 'newline-and-indent 'picture-duplicate-line)
       (picture-substitute 'next-line 'picture-move-down)
       (picture-substitute 'previous-line 'picture-move-up)
-      (picture-substitute 'beginning-of-line 'picture-beginning-of-line)
-      (picture-substitute 'end-of-line 'picture-end-of-line)
+      (picture-substitute 'move-beginning-of-line 'picture-beginning-of-line)
+      (picture-substitute 'move-end-of-line 'picture-end-of-line)
       (picture-substitute 'mouse-set-point 'picture-mouse-set-point)
 
       (define-key picture-mode-map "\C-c\C-d" 'delete-char)